Auto merge of #2415 - kamalmarhubi:doc-env-var-cargo-manifest-dir, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 25 Feb 2016 18:47:09 +0000 (18:47 +0000)
committerbors <bors@rust-lang.org>
Thu, 25 Feb 2016 18:47:09 +0000 (18:47 +0000)
1  2 
src/doc/environment-variables.md

Simple merge